projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b9abf2
)
* nsterm.m (ns_select): Count fd:s in writefs also.
author
Jan Djärv
<jan.h.d@swipnet.se>
Sun, 14 Oct 2012 18:28:48 +0000
(20:28 +0200)
committer
Jan Djärv
<jan.h.d@swipnet.se>
Sun, 14 Oct 2012 18:28:48 +0000
(20:28 +0200)
Fixes: debbugs:12422
src/ChangeLog
patch
|
blob
|
history
src/nsterm.m
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 346fe0e86b30fd9b3f050ce1e6a88d79a934bd70..0b3d02f75acfa4ae82a19968f5f6ddba8edaad4e 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,7
@@
+2012-10-14 Jan Djärv <jan.h.d@swipnet.se>
+
+ * nsterm.m (ns_select): Count fd:s in writefs also (Bug#12422).
+
2012-10-13 Jan Djärv <jan.h.d@swipnet.se>
* gtkutil.c (xg_set_widget_bg): Divide by 65535 (Bug#12612).
diff --git
a/src/nsterm.m
b/src/nsterm.m
index 98dd0a8aab103bcf7fdc124e36ddbf8cbe343677..dfc84db50f7e9fab223f02f1b415a3076d984e6f 100644
(file)
--- a/
src/nsterm.m
+++ b/
src/nsterm.m
@@
-3444,7
+3444,10
@@
ns_select (int nfds, fd_set *readfds, fd_set *writefds,
/* NSTRACE (ns_select); */
for (k = 0; readfds && k < nfds+1; k++)
- if (FD_ISSET(k, readfds)) ++nr;
+ {
+ if (FD_ISSET(k, readfds)) ++nr;
+ if (FD_ISSET(k, writefds)) ++nr;
+ }
if (NSApp == nil
|| (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0))